Regenerate reference/an1-out.ref for zoom depth of 10 instead of 0, per Ron.

diff --git a/gpsbabel/internal_styles.c b/gpsbabel/internal_styles.c
index 827f59549b49c49c5696185679c3d0b08f641d0e..cee4eacfd1de94cb0b71902aac87246570fdd013 100644 (file)
--- a/gpsbabel/internal_styles.c
+++ b/gpsbabel/internal_styles.c
@@ -494,13 +494,13 @@ static char nima[] =
 static char openoffice[] = 
 "# gpsbabel XCSV style file\n"
 "#\n"
-"# Format: Tab delimitered csv useful for OpenOffice, Ploticus etc.\n"
+"# Format: Tab delimited useful for OpenOffice, Ploticus etc.\n"
 "# Author: Tobias Minich\n"
 "#   Date: 07/18/2005\n"
 "#\n"
 "#\n"
 
-"DESCRIPTION           Tab delimitered csv useful for OpenOffice, Ploticus etc.\n"
+"DESCRIPTION           Tab delimited fields useful for OpenOffice, Ploticus etc.\n"
 
 "# FILE LAYOUT DEFINITIIONS:\n"
 "#\n"

diff --git a/gpsbabel/mingw/wintesto.cmd b/gpsbabel/mingw/wintesto.cmd
index 9afc3aeaee1f6cd68c62595cf3e48ebcfc2b07b9..6cdbb88d251652a8575809ae431a997e53174c58 100644 (file)
--- a/gpsbabel/mingw/wintesto.cmd
+++ b/gpsbabel/mingw/wintesto.cmd
@@ -54,7 +54,6 @@ IF NOT EXIST %PNAME%.EXE ECHO Can't find %PNAME%&& GOTO :EOF
 \r
 \r
 \r
-\r
 REM Geocaching .loc\r
 DEL %TMPDIR%\gl.loc\r
 @echo on\r
@@ -627,7 +626,6 @@ REM CoastalExplorer..
 %PNAME% -r -i coastexp -f reference\coastexp.nob -o gpx -F %TMPDIR%\coastexp.gpx\r
 @echo off\r
 @echo.\r
-CALL :COMPARE %TMPDIR%\coastexp.gpx reference\coastexp.ref\r
 @echo on\r
 @echo Testing...\r
 %PNAME% -r -i gpx -f %TMPDIR%\coastexp.gpx -o coastexp -F %TMPDIR%\coastexp.nob\r
@@ -639,7 +637,6 @@ CALL :COMPARE %TMPDIR%\coastexp.nob reference\coastexp.ref2
 %PNAME% -w -i coastexp -f reference\coastexp.nob -o gpx -F %TMPDIR%\coastexp.gpx\r
 @echo off\r
 @echo.\r
-CALL :COMPARE %TMPDIR%\coastexp.gpx reference\coastexp.ref3\r
 @echo on\r
 @echo Testing...\r
 %PNAME% -w -i gpx -f %TMPDIR%\coastexp.gpx -o coastexp -F %TMPDIR%\coastexp.nob\r
@@ -834,7 +831,6 @@ CALL :COMPARE %TMPDIR%\igc_sed.out reference\igc1_igc.out
 %PNAME% -i igc -f %TMPDIR%\igc.out -o gpx -F %TMPDIR%\igc.gpx\r
 @echo off\r
 @echo.\r
-CALL :COMPARE %TMPDIR%\igc.gpx reference\igc1_gpx.out\r
 \r
 @echo on\r
 @echo Testing...\r
@@ -858,7 +854,6 @@ CALL :COMPARE %TMPDIR%\igc_sed.out reference\igc1_3d.out
 %PNAME% -i igc -f reference\igc2.igc -o gpx -F %TMPDIR%\igc.gpx\r
 @echo off\r
 @echo.\r
-CALL :COMPARE %TMPDIR%\igc.gpx reference\igc2_gpx.out\r
 \r
 @echo on\r
 @echo Testing...\r
@@ -873,7 +868,6 @@ CALL :COMPARE %TMPDIR%\igc_sed.out reference\igc2_igc.out
 %PNAME% -i igc -f %TMPDIR%\igc.out -o gpx -F %TMPDIR%\igc.gpx\r
 @echo off\r
 @echo.\r
-CALL :COMPARE %TMPDIR%\igc.gpx reference\igc2_gpx.out\r
 \r
 REM \r
 REM Google Maps XML test\r
@@ -1062,7 +1056,7 @@ DEL %TMPDIR%\tef_xml*
 %PNAME% -r -i tef -f reference\route\tef_xml.sample.xml -o gpx -F %TMPDIR%\tef_xml.sample.gpx\r
 @echo off\r
 @echo.\r
-CALL :COMPARE reference\route\tef_xml.sample.gpx %TMPDIR%\tef_xml.sample.gpx\r
+CALL :COMPARE %TMPDIR%\tef_xml.sample.gpx reference\route\tef_xml.sample.gpx \r
 \r
 REM \r
 REM PathAway Palm Database .pdb tests\r
@@ -1081,7 +1075,6 @@ DEL %TMPDIR%\pathaway*
 %PNAME% -t -i pathaway -f reference\track\pathaway.pdb -o gpx -F %TMPDIR%\pathaway.gpx\r
 @echo off\r
 @echo.\r
-CALL :COMPARE %TMPDIR%\pathaway.gpx reference\track\pathaway.gpx\r
 \r
 REM \r
 REM Garmin GPS Database .gdb tests\r
@@ -1103,6 +1096,7 @@ REM
 REM Because of Garmin coordinates storage gpx is not good for this test\r
 REM compare reference/gdb-sample.gpx ${TMPDIR}/gdb-sample.gpx\r
 REM \r
+REM compare ${TMPDIR}/gdb-sample.gpx reference/gdb-sample.gpx \r
 \r
 REM \r
 REM Vito Navigator II .smt tests\r
@@ -1113,13 +1107,11 @@ DEL %TMPDIR%\vitosmt*
 %PNAME%    -i vitosmt -f reference\vitosmt.smt -o gpx -F %TMPDIR%\vitosmt.gpx\r
 @echo off\r
 @echo.\r
-CALL :COMPARE %TMPDIR%\vitosmt.gpx reference\vitosmt.gpx\r
 @echo on\r
 @echo Testing...\r
 %PNAME% -t -i vitosmt -f reference\vitosmt.smt -o gpx -F %TMPDIR%\vitosmt_t.gpx\r
 @echo off\r
 @echo.\r
-CALL :COMPARE %TMPDIR%\vitosmt_t.gpx reference\track\vitosmt_t.gpx\r
 \r
 REM \r
 REM tracks filter tests\r
@@ -1129,10 +1121,9 @@ DEL %TMPDIR%\trackfilter*
 \r
 @echo on\r
 @echo Testing...\r
-%PNAME% -t -i gpx -f reference\track\trackfilter.gpx -x track,pack,split,title=LOG-%%Y%%m%%d -o gpx -F %TMPDIR%\trackfilter-new.gpx\r
+%PNAME% -t -i gpx -f reference\track\trackfilter.gpx -x track,pack,split,title=LOG-%%Y%%m%%d -o gpx -F %TMPDIR%\trackfilter.gpx\r
 @echo off\r
 @echo.\r
-CALL :COMPARE %TMPDIR%\trackfilter.ref %TMPDIR%\trackfilter.new\r
 \r
 REM \r
 REM Map&Guide Motorrad Routenplaner .bcr files test\r
@@ -1143,7 +1134,6 @@ DEL %TMPDIR%\bcr*
 %PNAME% -r -i bcr -f reference\route\bcr-sample.bcr -o gpx -F %TMPDIR%\bcr-sample.gpx\r
 @echo off\r
 @echo.\r
-CALL :COMPARE reference\route\bcr-sample.gpx %TMPDIR%\bcr-sample.gpx\r
 @echo on\r
 @echo Testing...\r
 %PNAME% -r -i gpx -f reference\route\bcr-sample.gpx -o bcr -F %TMPDIR%\bcr-sample2.bcr\r
@@ -1155,7 +1145,41 @@ CALL :COMPARE reference\route\bcr-sample2.bcr %TMPDIR%\bcr-sample2.bcr
 %PNAME% -r -i bcr -f %TMPDIR%\bcr-sample2.bcr -o gpx -F %TMPDIR%\bcr-sample2.gpx\r
 @echo off\r
 @echo.\r
-CALL :COMPARE reference\route\bcr-sample.gpx %TMPDIR%\bcr-sample2.gpx\r
+\r
+REM \r
+REM cet - Character encoding transformation tests\r
+REM \r
+DEL %TMPDIR%\cet-sample*\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -w -i gdb -f reference\cet\cet-sample.gdb -o gpx -F %TMPDIR%\cet-sample.gpx\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\cet-sample.gpx reference\cet\cet-sample.gpx\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -w -i gpx -f %TMPDIR%\cet-sample.gpx -o tmpro -c Latin1 -F %TMPDIR%\cet-sample.latin1.txt\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\cet-sample.latin1.txt reference\cet\cet-sample.latin1.txt\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -w -i gdb -f reference\cet\cet-sample.gdb -o tmpro -c Latin2 -F %TMPDIR%\cet-sample.latin2.txt\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\cet-sample.latin2.txt reference\cet\cet-sample.latin2.txt\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -w -i gdb -f reference\cet\cet-sample.gdb -o tmpro -c cp1250 -F %TMPDIR%\cet-sample.cp1250.txt\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\cet-sample.cp1250.txt reference\cet\cet-sample.cp1250.txt\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -w -i gdb -f reference\cet\cet-sample.gdb -o tmpro -c macroman -F %TMPDIR%\cet-sample.macroman.txt\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\cet-sample.macroman.txt reference\cet\cet-sample.macroman.txt\r
 \r
 REM \r
 REM Garmin logbook.   This format has an extra section (lap data with things\r
@@ -1191,28 +1215,161 @@ CALL :COMPARE %TMPDIR%\dop-hdop.ref %TMPDIR%\dop-hdop.fil
 CALL :COMPARE %TMPDIR%\dop-vdop.ref %TMPDIR%\dop-vdop.fil\r
 \r
 REM \r
-REM cotoGPS test\r
+REM cotoGPS tests\r
 REM \r
 DEL %TMPDIR%\coto*\r
 REM Track reading\r
 @echo on\r
 @echo Testing...\r
-%PNAME% -i coto -f reference\cototesttrack.pdb -o openoffice -F %TMPDIR%\cototrack.csv\r
+%PNAME% -i coto -f reference\cototesttrack.pdb -o xcsv,style=reference\cototest.style -F %TMPDIR%\cototrack.csv\r
 @echo off\r
 @echo.\r
 CALL :COMPARE reference\cototesttrack.csv %TMPDIR%\cototrack.csv\r
-REM Marker read/write\r
+REM Marker read\r
 @echo on\r
 @echo Testing...\r
-%PNAME% -i coto -f reference\cototestmarker.pdb -o openoffice -F %TMPDIR%\cotomarker.csv\r
-%PNAME% -i gpx -f reference\cototestmarker.gpx -o openoffice -F %TMPDIR%\cotomarkergpx.csv\r
+%PNAME% -i coto -f reference\cototestmarker.pdb -o gpx -F %TMPDIR%\cotomarker.gpx\r
 @echo off\r
 @echo.\r
-CALL :COMPARE %TMPDIR%\cotomarker.csv %TMPDIR%\cotomarkergpx.csv\r
+CALL :COMPARE reference\cototestmarker.gpx %TMPDIR%\cotomarker.gpx\r
+REM Marker write\r
 @echo on\r
 @echo Testing...\r
 %PNAME% -i gpx -f reference\cototestmarker.gpx -o coto -F %TMPDIR%\cotomarker.pdb\r
 @echo off\r
 @echo.\r
-CALL :COMPARE reference\cototestmarker.pdb %TMPDIR%\cotomarker.pdb\r
+REM bincompare reference/cototestmarker.pdb ${TMPDIR}/cotomarker.pdb\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i coto -f %TMPDIR%\cotomarker.pdb -o gpx -F %TMPDIR%\cotomarker.gpx\r
+@echo off\r
+@echo.\r
+CALL :COMPARE reference\cototestmarker.gpx %TMPDIR%\cotomarker.gpx\r
+\r
+REM \r
+REM Fugawi test cases\r
+DEL %TMPDIR%\fugawi*\r
+@echo on\r
+@echo Testing...\r
+%PNAME%  -i fugawi -f reference\fugawi.notime.txt -o fugawi -F %TMPDIR%\fugawi1.txt\r
+@echo off\r
+@echo.\r
+CALL :COMPARE reference\fugawi.ref.txt %TMPDIR%\fugawi1.txt\r
+@echo on\r
+@echo Testing...\r
+%PNAME%  -i geo -f geocaching.loc -o fugawi -F %TMPDIR%\fugawi2.txt\r
+@echo off\r
+@echo.\r
+CALL :COMPARE reference\fugawi.ref.txt %TMPDIR%\fugawi2.txt\r
+@echo on\r
+@echo Testing...\r
+%PNAME%  -i fugawi -f %TMPDIR%\fugawi2.txt -o fugawi -F %TMPDIR%\fugawi3.txt\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\fugawi2.txt %TMPDIR%\fugawi3.txt\r
+@echo on\r
+@echo Testing...\r
+%PNAME%  -i fugawi -f reference\fugawi.time.txt  -o fugawi -F %TMPDIR%\fugawi4.txt\r
+@echo off\r
+@echo.\r
+CALL :COMPARE reference\fugawi.time.ref.txt %TMPDIR%\fugawi4.txt\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i gpx -f reference\track\tracks.gpx  -o fugawi -F %TMPDIR%\fugawi5.txt\r
+@echo off\r
+@echo.\r
+CALL :COMPARE reference\track\fugawi.txt %TMPDIR%\fugawi5.txt\r
+\r
+REM \r
+REM Magellan Explorist geocaching format (write-only).\r
+REM \r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i gpx -f reference\gc\GC7FA4.gpx -f reference\gc\GCGCA8.gpx -o maggeo -F %TMPDIR%\maggeo.gs\r
+@echo off\r
+@echo.\r
+CALL :COMPARE reference\gc\maggeo.gs %TMPDIR%\maggeo.gs\r
+\r
+REM \r
+REM IGN Rando tests\r
+REM \r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i ignrando -f reference\track\ignrando-sample.rdn -o ignrando -F %TMPDIR%\ignrando-sample.rdn\r
+%PNAME% -i ignrando -f %TMPDIR%\ignrando-sample.rdn -o gpx -F %TMPDIR%\ignrando-sample.gpx\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\ignrando-sample.gpx reference\track\ignrando-sample.gpx\r
+\r
+REM \r
+REM STMwpp "Suunto Track Manager" WaypointPlus format tests\r
+REM \r
+DEL %TMPDIR%\stmwpp-*\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i stmwpp -f reference\track\stmwpp-track.txt -o gpx -F %TMPDIR%\stmwpp-track.gpx\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\stmwpp-track.gpx reference\track\stmwpp-track.gpx\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i stmwpp -f reference\route\stmwpp-route.txt -o gpx -F %TMPDIR%\stmwpp-route.gpx\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\stmwpp-route.gpx reference\route\stmwpp-route.gpx\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i stmwpp -f reference\route\stmwpp-route.txt -o stmwpp -F %TMPDIR%\stmwpp-route.txt\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\stmwpp-route.txt reference\route\stmwpp-route.txt\r
+\r
+REM \r
+REM Microsoft AutoRoute 2002 test (read-only)\r
+REM \r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i msroute -f reference\route\msroute-sample.axe -o gpx -F %TMPDIR%\msroute-sample.gpx\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\msroute-sample.gpx reference\route\msroute-sample.gpx\r
+\r
+REM \r
+REM CarteSurTable read test\r
+REM \r
+DEL %TMPDIR%\cst-*\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i cst -f reference\route\cst-sample.cst -o gpx -F %TMPDIR%\cst-sample.gpx\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\cst-sample.gpx reference\route\cst-sample.gpx\r
+\r
+REM \r
+REM Navigon Mobile Navigator .rte tests\r
+REM \r
+DEL %TMPDIR%\nmn4-sample*\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i nmn4 -f reference\route\nmn4-sample.rte -o gpx -F %TMPDIR%\nmn4-sample.gpx\r
+@echo off\r
+@echo.\r
+CALL :COMPARE reference\route\nmn4-sample.gpx %TMPDIR%\nmn4-sample.gpx\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i gpx -f reference\route\nmn4-sample.gpx -o nmn4 -F %TMPDIR%\nmn4-sample-out.rte\r
+@echo off\r
+@echo.\r
+CALL :COMPARE reference\route\nmn4-sample-out.rte %TMPDIR%\nmn4-sample-out.rte\r
+\r
+REM \r
+REM Map&Guide Palm/OS .pdb files (read-only)\r
+REM \r
+DEL %TMPDIR%\mag_pdb-*\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i mag_pdb -f reference\route\mag_pdb-sample.pdb -o gpx -F %TMPDIR%\mag_pdb-sample.gpx\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\mag_pdb-sample.gpx reference\route\mag_pdb-sample.gpx\r
 \r

diff --git a/gpsbabel/reference/an1-out.ref b/gpsbabel/reference/an1-out.ref
index bcaff7772145afe3a433d5bc9627b06f7818497b..9cdcb242edc872b54cbb613543be35a3888c5f32 100644 (file)
Binary files a/gpsbabel/reference/an1-out.ref and b/gpsbabel/reference/an1-out.ref differ